Merge branch 'ticket28668_035' into ticket28668_040

diff --cc src/test/test_address.c
Simple merge

diff --cc src/test/test_util.c
Simple merge