change validity to 6 weeks
Merge branch 'staging'