OpenNMS Development: pr-NMS-10357 (21.1.0-SNAPSHOT)