BRANCH 4.2: more updates on expanding multiple sandboxes and repos