Fix update script. Get rid of yaml manipulation.
Merge branch 'dev'

Fix update script, no yaml manipulation.