7.x dev 1.0

File element fixes