Backport commit 932f88234838983f54a9ae74439b8d6bf6f12108 to debian branch

stay synced