IMPORTANT: Only stable and tested changes to the CMDI tookit should be merged to this branch! See toolkit/README for more information.