Merge "Parametrize target_dir for the timestamp"