Bringing master change to beta

Finally and for real.