Fix for default value on hot fix update.
Merge branch 'refs/heads/master' into 2.2.x-legacy