drop Fk before altering the column name
Merge branch 'InnoDBSupport' into staging-stable