Merge branch 'hotfix/moreCommments'
Merge branch 'hotfix/fix_resuming_without_filtering_bug' into develop