AF-918 supporting raw paths