Merge branch 'ml/rebase-x-strategy'