Merge "Follow-up 31be7d0: send tags list if experimental mode is disabled"