Merge branch 'ict' into ict2