Merge branch 'hotfix/hotfix_1' into develop
added rel 1
Merge branch 'release/release_1'