Merge branch '1490_ref_cleanup' into 1178_ref_fix_forward_vector