Merge "SpecialNewFiles: Swap from/to date serverside"