Merge "Update existing interactors to use new APIs when refactor enabled" into main