Merge change 5397 into donut

* changes:
  Fixes #1943915. Prevents circular dependency exception when using several NO_ID views.