Merge branch 'kb/fix-segfault-in-gdb' into kb/devel
Merge branch 'kb/fscache-v3' into kb/devel