Fix submit button bug
Merge branch 'hotfix/1.6.8'
Merge tag '1.6.8' into develop

Hotfix release 1.6.8