Querytime propagation issue

Integrate to master:
- changes by @brki for making integrated querytime propagation work properly

This PR is mainly a stabilization/bugfix changeset.