Recipe option
Add support for wasp, minor fix
Merge branch 'client-dev' into wasp