Merge branch 'jc/fpl'