New branch for frameworks/base