Cherry-pick MR !155 to master branch
DaVinci:minor adjustment for Turbo MC processing See merge request !155 (merged) (cherry picked from commit 0dd24b73)
DaVinci:minor adjustment for Turbo MC processing See merge request !155 (merged) (cherry picked from commit 0dd24b73)