Fix secure detection
Merge branch '3.2/master' into 3.3/master