- Be more compatible with the development apache branch. Allow working with