r24614: Merge with current lorikeet-heimdal. This brings us one step closer