Always use the value of rebuild_strict
Add test
Fix test
Merge pull request #1343 from lamblin/fix_rebuild_strict

Always use the value of rebuild_strict