Fixes to two potential memory usage issues
Fixes to two potential memory usage issues
Fix for race condition
Merge branch 'master' into v9