Fortinet NSE7 - Network Security Architect

Does anyone know if the new exam is using Enteroruse Firewall Admin questions?
NSE library has enterprise firewall admin and sdwan modules but nothing that lines up with name Network security architect or is it a whole new exam with both modules combined?