ODM Pattern troubleshooting

From C-7KDB897