Merge new changes from the above repository. It contains some essential bugfixes.
mentioned in commit 99417194