Merge branch 'scopetracker-nothrow'