This patch has been committed upstream via: https://github.com/cfengine/core/commit/732126ba00f8a5f0d5de5e8b637d9067a3c2102d We've tested it here at $WORK, works as advertised. see https://github.com/cfengine/core/pull/5462 We were just adding it via EXTRA_PATCHES+= on sysutils/cfengine to patch 3.23.0 I am not sure how best to apply the patch to the tree properly, so I have not attached a patch.