Updated against r6119, yet unfinished.<br><br>Signed-off-by: Idwer Vollering &lt;<a href="mailto:vidwer@gmail.com">vidwer@gmail.com</a>&gt;<br>