Convert default python codeblocks to yaml and fix CLI examples
Merge pull request #15753 from nmadhok/patch-1

Convert default python codeblocks to yaml and fix CLI examples