Merge "Move zen rule deletion" into tm-qpr-dev