Update V2.2 (reverted from commit 247488859c255aa7b9c3e005db7409bf3d6b05f7)