Merge "Merge commit '40dffd9623e1062978f61163c06410841a31b124' into manual_merge_40dffd9623e1062978f61163c06410841a31b124" into nyc-dev