Merge pull request #18268 from sunilpawar/report_47