better hashes processing
Merge branch 'master' into nook
Exception => Throwable (to catch OOM)
Merge branch 'master' into nook