SONATA-448 - Fixed order
Merge pull request #288 from sylvaindeloux/2.3-develop

SONATA-448 - Fixed order