Merge bb010g's changes