fix #669
fix #671
Related to #669
fix #670

Note that this change will require running setup and resetting the
rules.
release id 3983b1fa6c