BTAN-11839

BTAN-11839