tweak
Merge remote-tracking branch 'origin/master'
update directives and auth