Merge remote-tracking branch 'alexis/libs/realtime' into next