This branch includes the following enhancements and fixes:
Please let me know, if you want to apply only a subset of those changes. Then I can provide separate branches.