GMP-292

Will need to be reviewed as the rest of the project comes along to make sure the build is still working correctly.