Changed to field updater
Merge pull request #1237 from akarnokd/SafeSubscriberMemory

SafeSubscriber memory reduction