Moved custom changes to 2.2 branch