Lcg/11 stable merges