Merge "Modified to display valid value set in Role when capturing log dump" into main