XDEV: update for master