manual merge from master to beta