Merge "Add policy for persist time folder"