Closes #3515174
This just rebases the upstream examples 4.0.x, 8 commits ahead. Brings it up to March, 2025