cherry-pick/revert: add support for -X/--strategy-option