(cherry picked from commit e7f647bf)
(cherry picked from commit 3b3ed902)
(cherry picked from commit ca6481d1)
(cherry picked from commit 501a1d6a)

(cherry picked from commit ba297070)

(cherry picked from commit 7f22f081)

(cherry picked from commit 8f3d9750)

Tom Teichler authored 3 years ago and Jonathan Weth committed 3 years ago

(cherry picked from commit dd48a5b5)

Jonathan Weth authored 3 years ago and Tom Teichler committed 3 years ago

(cherry picked from commit 70a74166)