Sync feature/combine-domain-payloads
branch with master
#3676
+385
−276
feature/combine-domain-payloads
branch with master
#3676