fix fx pages
Merge branch 'master' into jp