merged interim/pmt changes r2243:2248 into the trunk