Merge change I7e5ab3b1

* changes:
  Continue es2 shader dev