Merge branch 'release/1.4.0'
moved update before install and added upgrade