OpenNMS Development: jira-NMS-12368 (25.0.0-SNAPSHOT)