BS-8315 done on behalf of in Portal