Bilal dev [CFNR-158]

Keystone changes for [CFNR-158]