Merge branch 'nabinhait-tax_rule_patch' into develop