Pull upstream changes for Bootstrap and Ninja
Pull upstream changes for Vanilla API