Adding missing files from commit 5616d19.