Manually merged some patches namely the scheduling errors