v0.1.2.2 merge