Single squashed commit for converting master into beta