Merge with CM-Friendly branch from 409ea404674769920de0a5db7c19eec15dd6f9b2 to f51a88b93666a3e29204fad612cc6f6cb0bc7259

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