Merge "Fix the case of the missing header." into tm-qpr-dev