[blivet:master 00/11] #1109195 related patches (v2)