Add error redirect and remove payment details(temp)
fix optional analytics
Merge branch 'release' into development