Update to examples from SVN r8056