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