Merge branch 'feature-fjcontrib'