Merge "Add Global JJB to Demo repo"