[fa] ch1 update
Merge pull request #825 from mxamin/master

[fa] ch1 update