r19644: Merge up to current lorikeet-heimdal, incling adding