Merge 79190fe06b (7.3.0-pre) and serialize_service_properties This combines two merges because each individual merge breaks the build on its own. See merge request !175
79190fe06b