Merge "qtip: adapt job template for different streams"