Newer gamma

A subset of #2764 avoiding troublesome parts. The reason for this PR is to merge the essential parts as soon as possible.