updates to integrate downstream changes