Merge branch 'hotfix/changesFromLS'
Update
Merge branch 'hotfix/GDTJava' into develop