(COMMIT-55) AddressController and CommonController modifications