Merge remote-tracking branch 'brauner/vfs.all' into kdevops