fixes for beta
Merge branch 'master' into sandbox-jm