Tried merge from dcrypt to master