[Lima-commits] 02/02: Merge branch 'feature/1228' into develop