Merge branch 'hotfix/2.2.1'
quick hotfixes for crashes when there is no ID available for a story
Merge branch 'hotfix/2.2.2' into development