Handle case of single object pushPayload

Rebased version of pr #1468.