Merge branch 'unblock-shutdown' into 'ibm-trunk'

Unblock shutdown

See merge request !11