Merge for PanCancer release

Final tidy complete