Merge "Handle object in thread-safe manner." into tm-qpr-dev