Merge branch 'bs/sendemail-tighten-anything-by'