Merge "Update documentation for old and new properties support"