Fixes/ticket#1467 #1614

Closed Abdelghani90 closed 1 year ago