merge 2.3.0 updates into latest