r19598: Ahead of a merge to current lorikeet-heimdal: