Merge "Removed orphan file" into release-4-6