Merge "Support configuration reset and dump" into main