Merge "Make addAddress locale safe"