Merge branch 'darshanaherath-master-patch-39072' into 'master'

Removing hard coded schema version and data-partition-id values!

See merge request !140
2 jobs for master in 8 seconds (queued for 1 second)