final commit 4.2.3