Some merges from cm-10.2
Signed-off-by: iGio90 <giovanni.rocca.90@gmail.com>