Codebase up-to-date with 2.0.4 Beta 1