Merge from master
Fixing bugs caused by quality improvements