Merge master to beta for testing

See commits for details.