Merge changes from topic 'web-sockets'