Rebased/develop/doc patch dropbox dev 4 4

Forward PR #409 from `dev_4_4` to `develop`.