BK-1200 Show image thumbnail in Media tab
Merge branch 'BK1200' into 2.0