Merge commit 'b728c072e98ee560dc97744c85d914bd550a8a43' * commit 'b728c072e98ee560dc97744c85d914bd550a8a43': Add replace flag to a few more broadcasts.