Merge branch 'feature/keyword-policy' into 'develop'