backported security changes
Merge branch '1.5/develop' into 1.5/master