Added deleted interface method
Merge branch 'subscription' into personalization
Added NoneType check
Merge branch 'subscription' into personalization