Merge "Show previous query upon configuration change" into tm-dev