Don't let address class modify original string
Merge branch 'release/v2.5.4-m76-5' into develop