Cherrypick #280 (#282) (#15258) (#15319)