Forward keyword 'Test' to test server
Merge branch 'hotfix/development_fix'