Updated to lastest cppcomponents changes, does not break binary compatibility