#1489, #1497
Signed-off-by:KProvance <kevin.provance@gmail.com>
#1489, #1497
Signed-off-by:KProvance <kevin.provance@gmail.com>