merge/1.16 which adds in the new backported features

merge/1.16 which adds in the new backported features #433