Merge branch 'fix_awt_stacktrace' into test_client_stsc

8 jobs for test_client_stsc in 140 minutes and 47 seconds (queued for 3 seconds)