will deploy these changes as 2.16.10