Merge "fix elst calculations"