Fix migration 20161123154034
and 20120411123334
#3113
Merged
20161123154034
and 20120411123334
#3113