Closing as we do not intend to back port fixes beyond current release.
*** Bug 1926440 has been marked as a duplicate of this bug. ***