Updates with FA 4.2.0