Batch of commits #2.