Merge "Correct the PWLE valid duration" into tm-dev