Merge "Ambient occlusion support in DLI model" into devel/master