Merge "Change -nodeps to -source" into tm-qpr-dev