Merge Heca dev branch into Heca Master