* apply R8157 from the dav-rework branch: