Merge "Use correct timescale for "date taken" field" into klp-dev