Merge remote-tracking branch 'origin/bko-paras-authorize-set-current-code' into bko-paras-authorize-set-current-code