Clean up and fix +1/-0 syntax to work as expected
Merge branch 'fix-dircycle-plugin' into dev