Fix #11913
Fix #10736 - Change data export to be available for non-functional accounts - Change non-functional accounts to include redirecting accounts