included change that was only present in legacy branch