Merge "composer: cleanup CommandWriterBase and CommandReaderBase"