commit 17_06_13 12:00