Merge "Fix ComponentResolver Computer consistency"