incorporate blue-button-xml changes