Add missing new files from commit 131e09855e06