Merge branch 'doc/2.x/properties' into 2.x