Squashed several commits from rascarlo and beergang