Merge "RegisterVisuals has option not to auto stage visual" into devel/master