(Bug 4830) Move betafeatures to beta

Final-final (merging into develop branch)