BUG:31504066 Skip merge of d6eb16d into nyc-dev