change validity to 2 months
Merge branch 'development' into staging
Merge branch 'staging'