Merge "Fix checking of compos.info"