CLT-177 Bug fix on commit f47441b9 - rolled in release v0.11.0