Merge "Add requiredSystemPropertyValue support in idmap2"