Merge m8-3.4.0-g87b5a4d
Signed-off-by: jfdsmabalot <kernelhackx@gmx.com>