[Lima-commits] 04/04: Merge branch 'feature/1286-ordered-entries' into develop