Addresses ISLANDORA-1139.