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