Merge "fix broken ColorBufferTest" into jb-mr1-dev