Code to <locations> resubmitted. re #6181