Merges from BS12:master