Master merge

The #464 merge to apha-3.0