Merge "Restore old behavior in pulic API setGeometry" into sc-dev