Commit final TO-017