(cherry picked from commit 7c27d012ae4d9906c601098c61f444fbe326c04a)
(cherry picked from commit 5a1a8df251242a1730bf298d715883742ae44100)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com> (cherry picked from commit f4498d111821fd5db927fdf2fe297c9241a81c31)