FLEX-11845

FLEX-11845