commit 18/12