Post-merge fixes
Properties internals almost replaced