Updating backport patch multi-datastore support