Suggested by: @oparoz

(cherry picked from commit b41fc618)
(cherry picked from commit efb83c51)
(cherry picked from commit d74c2749)
(cherry picked from commit 6abb7dfa)
(cherry picked from commit 29ddac46)
(cherry picked from commit 7ec49ce3)