Baystation Update Merge 02

04JUN2014