Additional backports for the 3.4.2 Release

According to the PR #562, we need some additional backports of some fixes.


@deiferni please have a look ...