Merge branch 'release/v3.3.8.4' into develop
Fixed: added yydebug.jar to marathon.bat
Merge branch 'release/v3.3.8.5'