Merge updates from Baystation12