#1471 & #1472
Signed-off-by:KProvance <kevin.provance@gmail.com>