Merge "SystemProperty to create disabled usertypes"