Merge Master into feature/cray-energy