This commit is a squashed and slightly modified backport of the following commits on the master branch: * 77d935b * d07b910 * 519dfe1 * a59d5ac
77d935b
d07b910
519dfe1
a59d5ac