Merge change 5703

* changes:
  Add JS Flag support.