Merge fixes from the beta-test into the 2.1.x branch

...