Merge "Fix serviceProfile serialize"