Bring recent changes over to beta channel

[filipesperandio]

These commits were all reviewed already when merging to master. I'm going ahead and merge it into channel/beta as well.