#1623, #1622
Signed-off-by:KProvance <kevin.provance@gmail.com>
Merge origin/master