Lcg/merge from 11 stable