some fix for correct start without java
Merge remote-tracking branch 'origin/master'
update beta 19