Update deprecated commitments (#16794)