Merge branch 'avoid_deadlock_nested_calc_mv' into 'master'
lock removed to avoid deadlock.
See merge request !4288 (merged)
(cherry picked from commit a2d47417)
a67c9360 lock removed to avoid deadlock.
lock removed to avoid deadlock.
See merge request !4288 (merged)
(cherry picked from commit a2d47417)
a67c9360 lock removed to avoid deadlock.