Merge "Draw Operation merging" into jb-mr2-dev