carderm

Thanks @BertrandBordage - do you think this could be merged as a pull request to resolve the issues?

Hi @BenjjinF - be great if we can get this commit in as it is stopping the manifest files. Let me know if we can assist? Thanks!