Merged 'fresh' branch into 'dev'