Merge branch 'gc-fix-datastore-dependencies' into 'master'

Rustam Lotsmanenko (EPAM)requested to merge
cherry-pick-fc0203d8 into release/0.26

Merge request template

Original MR: !464 (merged)

Edited by David Diederich

Merge request reports