Merge "Reset placeholder count when rebuilding resolver list." into rvc-dev