Merge branch 'feature/totp-input-improvements' into 'develop'