Merge "Extract unfold classes to a separate library" into tm-qpr-dev