2.5 RN update; elasticsearch update