updates to push back into integration branch
patches