[Master] Replace hard coded time with macro