Merge "Move where updateProperties is called"