Merge "SF: rename CommandWriterBase and CommandReaderBase"