Release 3.2.3 - Reverted bad merge