merge of master into mad293/HyperDex/master