Improved rule merge behaviour.
Merge branch 'develop'