This fix has been lost during the process of migration of cluster data manipulation functionality from the octane to this extension. Change-Id: Ife92cbd0e8d8f8376ffcb1f333d1fac9e911ff3e Closes-bug: 1573100