Merge remote-tracking branch 'jl/locks-4.13' into work.misc-set_fs