Manually merged the changes made in f59a244 to glidecondor_addDN