Step 1 and Step 2 are completed.
Subscription save method security issues are fixed.
Merge from baho code