Fix for Bug NMS-6536 - NRTG is throwing ConcurrentModificationException
Merge branch '1.12'