also only time-limit if a value is provided. R=rsc DELTA=9 (4 added, 2 deleted, 3 changed) OCL=18917 CL=18920