sync original before filling in case default attributes are set.
Merge branch '4.0'