Merge branches 'cooking' and 'issue_178' into production