Merge "Upversion router core in prep for branch"