Merge branch 'release/test_launch'
simulated hotfix
Merge branch 'hotfix/hotfix-test' into develop