Implement plan feature
Implement plan feature and check plan feature
Merge branch 'master' into plan_feature
Changes to check plan feature
Fixed issue and implement plan feature update for admin user
Fixed issue and changes
issue fixed for plan and features