Merge "Add missing include" include exists