Changes to support building the development branch