Merge proposals

fabric-manager-525 in Ubuntu has no merge proposals.