[1.5.x] Fixed #19706 - Tweaks to the tutorial.

Thanks Daniele Procida.

Backport of aa85ccf8ce from master.