Add support for 3.3.2 -> 3.4.0 upgrade path