Improve subscription behavior

Created by  Nathan Jaremko  on February 24, 2019
UCVMP2BZ7IIJTWG5ZA3ETJKEBFXTB7J5J25XE4T74RFTGSMZX4AAC
Change contents