5.0.3 Release Branch - DO NOT MERGE

Testing that functional tests pass.

**_DO NOT FREAKIN' MERGE_**