CB server: 2.5.1 RN addition