Merge changes I87bf1147,I1bfc5656 into nyc-dev