final update of V2.3 latest

This merges `master` back into `v2.3-latest` before moving `master` over to v2.4-latest