cm upstream and fixing broken boot