Partial support for the new v15 architecture.