Merged version of gallery (with newest master of AI2)