Fixes FLEX-33428
Fixes FLEX-32887
Fixes FLEX-33428 -- Previous commit had a spelling mistake.