Suggested by: @Antonio-Prado
Suggested by: @DokuKaefer

(cherry picked from commit c0b10d06)
(cherry picked from commit 9b652216)
(cherry picked from commit a0c0a254)
(cherry picked from commit 944de05c)
(cherry picked from commit 3442cf09)