Update with new shared code changes.
Build version 2.6.1