commit 03-17