Merge "Use resource list for SkipCDSBuildingBlockListener"