Merge "Upgrade NoMan's cancelation reposting logic"