get changes from aicc master