Merge commit 'eb3ec64a6a962aa48a46753c6e69ce24f889a4cc' * commit 'eb3ec64a6a962aa48a46753c6e69ce24f889a4cc': Fixes #1943915. Prevents circular dependency exception when using several NO_ID
Merge commit 'eb3ec64a6a962aa48a46753c6e69ce24f889a4cc' * commit 'eb3ec64a6a962aa48a46753c6e69ce24f889a4cc': Fixes #1943915. Prevents circular dependency exception when using several NO_ID