[Lima-commits] 03/03: Merge branch 'feature/1176-2' into develop