#1529, #1532, #1530
Signed-off-by:KProvance <kevin.provance@gmail.com>