forked from Silverfish/proton-bridge
(cherry picked from commit 934749b278e95a9d69818ddf6b45ee7bb896af03) (cherry picked from commit 7448b814e8e6da90335b8db465fd64e3d4f08bdd)
(cherry picked from commit 934749b278e95a9d69818ddf6b45ee7bb896af03) (cherry picked from commit 7448b814e8e6da90335b8db465fd64e3d4f08bdd)