Merge changes from topic "new_data_flag"

* changes:
  DO NOT MERGE temporarily disabled new data stack
  Inverted the new data stack flag