FX-317,FX-318,FX-319
Final commit pre 1.3.0