Fix some type/doc issues.
Merge branch 'dev-scr-doc-recommends' into dev
Update changelog.