FALCON-494 update feature broken. Contributed by Shwetha GS