Update shared code. Bump to v2.3.36