3.3.x sync