Additional batch of commits from Ensi