Added TODO comment for fix needed in MetadataDeployServiceImpl