Merge branch '1490_basop_cleanup' into 1178_basop_fix_forward_vector