Merging official changes with my working Beta branch