TEST MERGE: Merge of high priority issue fixes and pull requests on top of version 0.6.2

Merged.