[#686] Fix datastore validation error
Merge branch '686-fix-datastore-validation'