merge from 625_cand1

move the slhc branch forward to the latest 62x branch