Merge "Code synchronization with the core Resolver" into tm-qpr-dev