Merge branch 'cc/revert-strategy'