khoi commit 24-12