CIMI: restore fix from DTACLOUD-509 (61c88b6211c5b03522fb05932ef08f7cbe340f09)
seems to have been overwritten by stale branch/no rebase