Merge "Add post resolve property values" into nyc-dev