[dev] porting to 3.3