Merge "Add extra elements check for 'show_volume_type' command"