Merge changes from stub (Responsive images)