Merge pull request #2688 from vargaz/marshal-set-pending