[AS7-6938] Add and deploy does not fail if runtimeName already exists - WIP