- high res and preview separated
Merge remote-tracking branch 'origin/master'