Merge "Add logs to track down how OPS creation" into tm-qpr-dev