Merge branch 'hotfix/1.6.1'
- fix payent
- htaacess
Merge branch 'hotfix/1.6.2' into develop