add missing files from bug #4116 commit