CDV13: Estate Upgrade changes