Memory settings for stat and cleanup
Merge remote-tracking branch 'origin/feature/brian_2.4' into feature/brian_2.4