Merge proposals

ComLock has no merge proposals.