Closes #347
Merge branch '2.1M2' into qa