Merge "[POLICY] Add date to logging timestamp"