Merge branch 'sg/test-atexit'