CORE-5083: added some files that were missed in the last commit