Update for block speed and auth
Merge origin/master