Porting from g3u-3.4.0-g4f2c010