Build off 0.0.0.M2a from Eclipse/Sisu