OpenNMS Development: jira-NMS-8726-optimize (19.0.0-SNAPSHOT)