FRETS-21723

FRETS-21723