[Urgent] Develop merge candidate

Massive pull request from team 2.
======