Merge branch 'sg/test-verbose-log'