Merge "Adding comments and removes unnecessary parameter" into tm-qpr-dev