ck-3.12: merge experimental hibernation-related patch from Con
Merge branch 'ck-3.12' into pf-3.12