merged to gr-cdma master