Backported from upstream for-next branch. Signed-off-by: Pavel Reichl <preichl@redhat.com> Resolves: rhbz#2077816