Accept the last patch FS#10797 with a few changes by me (fixing side effects and...