Merge remote-tracking branch 'origin/master' into 13140_add_gui_pick_center_of_rotation_etc_from_images