Merge "init: always allow clearing a property"