merged foundation branch with default installation branch