Re-adding changes that got lost in last merge