Forward-port the security model changes from 2.0