Merge branch 'release/5.18.0' into develop