Merge branches 'relaying-keyerror' and 'file-transfer-progress'