Fixed ADT Dialog differences (REF-141)