Initial merge of raw-sha256 and cisco-4.