#1512, #1509, #1514
Signed-off-by:KProvance <kevin.provance@gmail.com>