(cherry picked from commit d50a3999)

(cherry picked from commit fad3eb90)

Fixes build

(cherry picked from commit 951e84e8)

(cherry picked from commit dd349ea6)

(cherry picked from commit 61706896)

(cherry picked from commit 9ad60177)

(cherry picked from commit 57ede658)

(cherry picked from commit 396a43d2)

(cherry picked from commit 79479694)

(cherry picked from commit ba7b53fd)

(cherry picked from commit 078a918f)

(cherry picked from commit cc43efd3)

Signed-off-by: Geoffrey Métais <geoffrey.metais@gmail.com>
(cherry picked from commit 2516df8b)

Signed-off-by: Geoffrey Métais <geoffrey.metais@gmail.com>
(cherry picked from commit 8416b555)

(cherry picked from commit 67f3eac9)

(cherry picked from commit 8c237867)