Merge updates from baystation12