Hotfix release

No due date 60% complete