FALCON-567 contributed by  Ruslan Ostafiychuk