Integrated AZ changes to anis d3d-refactor.
status : broken :P