Merge branch 'develop-Reorder' into 'master'

Refine code to improve efficiency

See merge request !48
1 job for master
in 8 minutes and 41 seconds, using 0 compute credits, and was queued for 6 seconds