[blivet:all 0/2] #1155151 related patches (v2)