Merge "Fix the Abatement issue"