Merge branch 'sg/test-verbose-log' into maint