Report question

Question: Backport changes from renamed file