merged interim/pmt r2248:HEAD into trunk