Merge branch 'jes2850-blacklists-take-2' of gitlab.syncad.com:hive/hivemind into jes2850-blacklists-take-2