Minor changes for migration
fixed bugs for Abos
Merge remote-tracking branch 'origin/master'