[1.1.2 -> main] consolidated security fixes from 1.0.5/1.1.2

[1.1.2 -> main] consolidated security fixes from 1.0.5/1.1.2 #3520