Merge "use checkContains to decide on components"