Upgrade to FJ 4.1-SNAPSHOT