ck-3.10: merge urwlocks patch
Merge branch 'ck-3.10' into pf-3.10