Updated PR for tracker #28256.

This is an updated PR and closes #1734.