Merge branch '1940_verbose_switch_off'