[2.2.1] Merge different codes between 2.2 and 3.0