Update changelog with latest changes
Bumping version to 1.3.18
Merge branch 'release-1.3.18' into develop

* release-1.3.18:
  Bumping version to 1.3.18
  Update changelog with latest changes