Resolve #3554905 "Clean full backport of 3.0.x"

Compatible with 11.2.x Compatible with 11.1.x Compatible with 10.5.x Untested with 10.4.x but likely compatible. Closes #3554905