Initial repository commitment for the MTS Collage Prototype
Merged in upstream changes