Added 2 new commits from development