Split aggregated Values when use splitAndDefer

And merged with 5c09e2e272003a32c584e7d2df9aa62d270ee2e6