Version 2.2 commit.

Port setting method addjustment.