Sync with upstream
Fixed bug RECIPES-8