Merge "Modify time only mode flag into set of values instead of just one." into pi-dev