Merge "Style fixes for mini resolver" into tm-dev