#332 - AS sync with Falcon (partial)