Downgrade importance of some logging in storage
Generate .map file
Improve memory usage
Merge remote-tracking branch 'upstream/master'