Merging dialog changes to the building branch