Switched environments library block order
Merge branch 'master' into branch2