Merge "SF: cleanup CommandWriterBase and CommandReaderBase part 2"