Ssa stabilized merged to stablebranch

Take 2