Latest updates to shared
2.3.23 release