Merge branch 'shutdown-hole-1' into 'ibm-trunk'

Shutdown hole 1

See merge request !52