* commit '3d1a83716e27fd2cafcd0e46d13cfa1394727212': Doze: Better handling for non-default templates.