Merge branch 'fb' into devel