[blivet:f21-branch 00/14] #1147087 related patches