Merge changes I473360d8,I7ec791b1 into main

* changes:
  Address minor comments.
  Add set supported value debug command.