'dev' fix from 'master'

Need to update 'dev' with the corrections just pushed to 'master' to be able to use it for upgrades.