minor refactoring: otp generates 1234 on otp:static flag is set under config
Merge branch 'dev'