Merge pull request #6686 from guanhuan/cancellation-credit-note