Updating to include recently merged changes