Issue #2962328 by scott_euser, itamair: Fix support for Address Module: source value from address field