Fixed issues reported by CI and merged as f193b945eac5..5496c763aadd

Thanks,

Sami Mujawar