FALCON-215 Falcon-start fails. Contributed by  Arpit Gupta