get rid of Field.media
Merge branch 'master' into field-block-2