merged in Coder fixes and BCC/CC fixes for 3rd party modules from 7.x-4.x