Backports for shared support from R1.05