Merged changes from HDX (VanessaE)