Update Adapter to 2.1.1
Merge pull request #4481 from ngocphamm/patch-12

Update Adapter to 2.1.1