Merge branch 'release/3.5.0' into develop
Fix assembly references

I started getting compiler errors because of missing assembly
references. I'm not sure why I didn't see them before. I added
the new references.
Merge branch 'release/3.5.1'