FALCON-238 Support updates at specific time. Contributed by Shwetha GS