update ChangeLog
update ICA
Merge branch 'master' into develop