Add force option and tests.
Merge branch 'force'