restore migration from 3.3
Merge branch 'master' into jacalvo/migration-from-3.3
added changelog entries
Merge branch 'jacalvo/migration-from-3.3'