attempting to get cl and ss branches merged