Change-Id: I4661664d1206aacdaf22a4a8f05d7962547faf45
(cherry picked from commit a8ebc12e)
(cherry picked from commit 8a2414e4)
Reviewed-on: https://gerrit.libreoffice.org/57326Tested-by: pranavk <pranavk@collabora.co.uk>
Reviewed-by: pranavk <pranavk@collabora.co.uk>