Removed horrible horrible comment
Merge branch 'core-FV' into v0.3