Merge "Update illustrations with fix for weird shape issue" into main