Resolved merge conflict in back ported UK postcode fix