17_12_13 commit