Jacalvo/migration from 3.4