Some changes made on some-branch-2.