Migrate to 3.4 #6575

Ref: GH-55
Merge branch 'pr/55' into develop

Ref: GH-55