interim commit
397.34 some encoder and reporting enhancements