[Lima-commits] branch feature/1298-FixNPE updated (bde8128 -> e3d95f9)