Merging Hotfix Release 1.1.9