Jsonrewriter: offer_cancelled is a side effect
Merge remote-tracking branch 'remotes/origin/develop'