Merge branch 'FLEX-26478' into develop