Changes related to boost upgrade