JC-1598: Changes according to review comments
Merge remote-tracking branch 'origin/jc1598.branchSubscriptionNotification'