Merge branch 'yoko-util' into 'ibm-trunk'

Yoko util

See merge request !31