Merge "Add a new method to set time"