Merge "Stop comparing Descriptions with memcmp" into nyc-dev