Merge "Refine PSDS periodic download" into tm-dev