Merge with-authentication branch into master