FALCON-104 FALCON-86 introduces a backward incompatible change. Contributed by Venkatesh Seetharam