Merge "Fixed error message to identify the correct file" into release-4-5-patches