qualification address handling changes, RT#7111