Port to 1.21.1#23

Amronos wants to merge 3 commits into1.21.1Amronos/createaddoncompatibility:1.21.1from

port-1.21.1Amronos/createaddoncompatibility:port-1.21.1Copy head branch name to clipboard