Bring in Dmitry branch commit.