57 Commits (CLDC-2491-Change-address-bug)