changes to support the development of master