Final Pre-Gull Lake Commit

Includes updates based on testing and the final build.