Updating the Official JB Repo with latest

Updating the Official JB Repo with latest