FALCON-711 Test retagged. Contributed by Paul Isaychuk