Refs #4798 - Fixing the subscription API