Merge feature branch feature/combine-domain-payloads-and-domain-storage-maps to master branch

Merge feature branch feature/combine-domain-payloads-and-domain-storage-maps to master branch #4340