[Lima-commits] 04/04: Merge branch 'feature/1295-improveEditEntryView' into develop