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

* commit '55b883b0a960b37aa453253f3ccb614dd95c221c':
  Draw Operation merging