NMS-6829 Applied diff supplied in issue and added pom.xml