Small merge fixes again
Merge remote-tracking branch 'origin/eli'