OpenNMS Development: cg-jira-NMS-12688 (26.1.0-SNAPSHOT)