Upstream Websocketaf merge

Created by  quartz55  on April 12, 2021
LB4HIYWKTVYQPH77VAQCFOXNO7JD72SMXTK2U6G7UC2MDQM6VHPAC
Change contents