Funcionality added :
-https://www.debugle.com/issues/127714
-https://www.debugle.com/issues/127715