NMS-6644: Some correction requested after first review by Ronny