added copies of relevant files from 8.38