Merge changes Idc93ad72,Icdc87c7c into main

* changes:
  Inline enableGraphOptimizer
  Clean GRAPH_OPTIMIZER FLAG