Merge change 7490

* changes:
  Fix master build errors post merge with master_gl branch.