Update Master 1

Updates to latest BS12 Master