Fork changes/fixes due to validation error in doubleclick studio