Merge branch 'fix/mrf-keyword-description' into 'develop'