nilo19: Cherry pick of #105188 and #98350 to release 1.21

No Results