Warning: a clean build will be needed probably to account for recent merge changes, or link errors will occur.