case-3588 - Order of elements
Merge branch 'case-3588' into development