Merge "Fix issue #10795385: System process crash reinstalling GEL -" into klp-dev