Build works, but is very messy. Needs clean-up after next SDK release.