Merge pull request #13446 from lockiechen/fix/creative-stream-websocket-13426-public