Version 2.1.18
MAPV3.1 changes (7591)
Merge branch 'release-2.1.18' into develop