BRG-11672

BRG-11672