OpenNMS Development: jira-NMS-10646 (23.0.4)