Merge "Add PROP_NAME_MAX validation"