CDV3 compatibility attempt (20130725.1)