Commit_18_06_14