FLEX-34398 FLEX-34408