Merge changes I3ac40130,I6acce43c into main

* changes:
  Updating the flag reset deprecation flag
  Removing old code