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