This is a combination of 3 commits.
(cherry picked from commit 48ef20f2)
(cherry picked from commit 00e89430)
(cherry picked from commit 1f0206d9)

Change-Id: Ic6fa6f335623e2114fc8bea76dc54833284d2a02
Reviewed-on: https://gerrit.libreoffice.org/68150
Tested-by: Jenkins
Reviewed-by: Andras Timar <andras.timar@collabora.com>