Synchronising towards version 2.5

Moving the changes into the master branch

assigned to @twoln

added 11 commits

• c2880509...1a6a3158 - 10 commits from branch master
• 6ae72f76 - Merge branch 'master' into 'twoln-dev'

Compare with previous version

added 1 commit

• d4dff7d6 - fix OTP registration process

Compare with previous version

added 1 commit

• a915b787 - restoring the cerrect version

Compare with previous version

closed