Reviewed-on: https://git.furtest.fr/xamidev/pepperOS/pulls/17
Reviewed-on: https://git.furtest.fr/xamidev/pepperOS/pulls/16