Merge Release-0.6.0 fixes to master