Add missing file after branch merge