Merge "Copy unformatted files from tm-qpr-dev to master"