Merge branch 'hotfix/fix_undefined_summary' into 'develop'