Merge Development0.05 back into the master branch

In preparation for the delivery of USML 1.0, we are merging development0.05 back into the master branch.