Merge "Removing unnecessary work adapter wrapper" into tm-qpr-dev