NMS-5889 fix system-report running
Merge branch '1.12'