mechanism for custom in place
fixed merge conflicts
Merge branch 'pcmdi_master'