TDQ-9268:fixed the update dialog build issues

but many commit where not merged to master before so I leave you to it.