adding missing files from 4.0.4 branch.