Update PSM Date and Time to be Selectable

Re-raise of #4448 so it can be further sorted out