Add demobundle, update vendor and small fix