Tweaking recipes and configuration.
Merge origin/master