Add missing file from commit 7706d21