Retire older upgrade scripts.
Merge branch 'dev' into test