stuff from 612slh6 that is ahead of 70x and 620
restoring 70x version
Merge pull request #232 from davidlange6/forward_port_612slhc6

stuff from 612slh6 that is ahead of 70x and 620