Addresses v7.6