display order respected
Merge branch 'master' into rimal-disp