Merge branch 'ah/doc-empty-string-is-false' into next