[Lima-commits] 03/03: Merge branch 'feature/1298-FixNPE' into develop