update for appliance fix
Merge branch 'master' into authenticate