Merge "resolver list is not cleared on rebuild"