Merge "Klockwork fixes: Distance field iteration Checking for null...