commit 11.06.14