stulacy Merge branch 'hotfix'