James dev

Merge latest FB release from upstream (v3.0.2)