Merge branch 'yoko_auxilliary_stream_format' into 'ibm-trunk'

Yoko auxilliary stream format

See merge request !54