New stable branch for frameworks/base and settings