Merge branch JIFX into master