Baystation12 master

Merge of successfully updated codes.