BS12 Master Merge #001

Merges BS12 Master into BayColony12 Master.