BDKD-240: Fixed issue that prevented moves from happening properly
BDKD-240: Fixed issue that prevented moves from happening properly

sirca/bdkd_datastore,sirca/bdkd_datastore,sirca/bdkd_datastore,sirca/bdkd_datastore,sirca/bdkd_datastore