Merge "(Bug 41298) partial fix: re-apply Id4d5504a"