#1444, #1449, #1447
Signed-off-by:KProvance <kevin.provance@gmail.com>