Merge "Cleanup of Visual::Base::SetSize" into devel/master