Merge branch 'collocated-csiv2' into 'ibm-trunk'

Collocated csiv2

See merge request !39