Merge latest commits from main fork

Merge latest commits from /NamelessRom/ sources