Merge pull request #3023 from splitbrain/subscribe-nodatapassed