propagated changes from collections libraries, fixed clashes