Merge default timer change from develop