universal subscription messages

Merge branch 'master' into stable