Some major revisit on security implementation.
Merge commit '704812c59ee380031f49ff08e1ae5fc12396f67e'