New PR for tracker #28256

This replaces PR #949 which is now out of date.