Merged branch reactclient