Small feature doc update.
Merge branch 'master' into EMP-209-0.0.23