Merge "Remove InitProperties" into main