Sync with Glitch_Flo_CAF - needs some fixing

Signed-off-by: Tk-Glitch <Ti3noU@gmail.com>