Sync 10a and 10c with the versions on the dev server