commit_17-02-14