Updated to version dev17