LPS-36695 Make folder subscriptions consistent