Fix conflict
Finessing this beast
Optimize images
Merge branch 'release/7.0.0' into develop