Build from the 11-dsc branch