Merge "Set secure flag & log exception"