commit 17-04