Updates for last merge