Merge branch 'bugfix/keyword-policy-check-summary' into 'develop'