v.1.10.16: Support 2.2 and 2.3.

Signed-off-by: vjt7312 <vjt7312@gmail.com>