Backport master to develop

Backport to ensure master changes in develop branch for betas