Merging my branch with final.

Tested my build to see that it runs okay with costa work.