Update IOC framework from main branch(2014-05-27)