Enabling secure mode. Commit17-3