commit 10.5 - 10.6