Merge "Remove scaffolding for multiple dots" into tm-qpr-dev