[IMP] library updated
Merge branch 'framework-master'