2-6, Add Loader

Signed-off-by: Yoann SOLACROUP <solacroup.yoann@gmail.com>
Merge branch '2-6' into dev