Merge "Check in for 0.6.2 bug fixes" into rel-0.6