am 30c990c3: Merge "Draw Operation merging" into jb-mr2-dev

* commit '30c990c361291ad578ef4ffe4a4dd0fd6080797b':
  Draw Operation merging