Take changes from master by hand.
-  Fix job_key and destination_key names.
-  Add check for null in DKV.