apply nounset later
Merge branch 'master' into staging