More logging
Optimize
Merge branch 'master' into deploy