[backfire] merge r21267, r21282, r21291 & r21318