Merge334 backports