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