This is our custom security code, I think we'd better keep it here. I opened another ticket which back port our custom security code to C*, we can handle this change there.