Merge "Comment assertion related to harmony behavior" into nyc-dev