Only force auto renew if not a forever plan
Merge branch 'dev'