Master bugs#10441 & #10448

Hi Martin,

I solved on this PR bugs #10441 and #10448.

Regards
Zoran