Merge pull request #568 from jeantil/expose-consumer-subscription-mode

Merge pull request #568 from jeantil/expose-consumer-subscription-mode #145