#10596 adding bugfixes