Alfons fixed
Merge branch 'hotfix/GF-3'
Version changed