Merge "Add ability to force rebuild list"