Merge branch 'okosse' into 'master'

hotfix: fix release branches for dev2

See merge request !483 (merged)

(cherry picked from commit c6b0a226)

e5a81b52 hotfix: fix release branches for dev2 1878fd39 Fix riles for dev environment cb998de3 fix typo