latest merged changes from fgj usb disk