Merge "Default property editing restores assertions"