Fix shutdown.
SPOI-3304 #comment changes to adhere to API
Merge branch 'dt-dev' into MLHR-1544