Merge "Update CommandWriter to CommandWriterBase"