Bugfix/5.6/tdi 30984 concurrency